Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Fri, 26 Mar 2010 07:01:19 +0000 (08:01 +0100)
committerJan D. <jan.h.d@swipnet.se>
Fri, 26 Mar 2010 07:01:19 +0000 (08:01 +0100)

Trivial merge